gpsbabelfe_disable_version_check

Disable version mismatch check.

Gbp-Pq: Name gpsbabelfe_disable_version_check

diff --git a/gui/babeldata.h b/gui/babeldata.h
index b79cd1dcd1b5953e5761c379aeb806e7f3c76efb..467c7413e85189ae7d2f809df311ccbc391f6de0 100644 (file)
--- a/gui/babeldata.h
+++ b/gui/babeldata.h
@@ -153,7 +153,7 @@ public:
   bool startupVersionCheck_{true};
   bool reportStatistics_{true};
   bool allowBetaUpgrades_{false};
-  bool ignoreVersionMismatch_{false};
+  bool ignoreVersionMismatch_{true};
   bool disableDonateDialog_{false};
   QDateTime donateSplashed_;
 };

diff --git a/gui/preferences.cc b/gui/preferences.cc
index 1cef2afd61b0bff6ccfe707468f0488bf453d08e..f12978f1f42c4b0f7f9a7dbe9a3ddd24a47bace4 100644 (file)
--- a/gui/preferences.cc
+++ b/gui/preferences.cc
@@ -49,7 +49,6 @@ Preferences::Preferences(QWidget* parent, QList<Format>& formatList,
 
   ui_.startupCheck->setChecked(babelData_.startupVersionCheck_);
   ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_);
-  ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_);
 
   connect(ui_.buttonBox, &QDialogButtonBox::accepted, this, &Preferences::acceptClicked);
   connect(ui_.buttonBox, &QDialogButtonBox::rejected, this, &Preferences::rejectClicked);
@@ -89,7 +88,6 @@ void Preferences::acceptClicked()
 
   babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked();
   babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked();
-  babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked();
   accept();
 }
 

diff --git a/gui/preferences.ui b/gui/preferences.ui
index 3bea6c2cac8c5d733090e82829bdfc0900703f5d..ac671d7d9357d98d07ac68eb8e680f0aab570bda 100644 (file)
--- a/gui/preferences.ui
+++ b/gui/preferences.ui
@@ -53,13 +53,6 @@
           </property>
          </widget>
         </item>
-        <item>
-         <widget class="QCheckBox" name="ignoreVersionMismatchCheck">
-          <property name="text">
-           <string>Ignore mismatch between command line and GUI version.</string>
-          </property>
-         </widget>
-        </item>
        </layout>
       </widget>
      </widget>